feat: made the ui similar to previous generation. However we still need to work