@emir-hasanbegovic finished doing the UI tweeks for existing pieces of UI