Made major UI changes