Implemented new layout and UI changes.