Redesigned the UI