Different approach of doing UI

changed the way it works