Implemented new UX/UI