Feature/ui cleanup

Just cleaning up some minor irritations.