UI/UX changes :)