Updated to make UX/UI easier + some styling changes