Restructured UI of the application