Changed UI and Added a dummy class