More UI, and removed fragment.
Things should now be shown pretty much correctly.