Remove some UI stuff
fix some spacing issues