More UI Tweaks and removal of dummy content