Minor changes to UI + Redundant code removal.