Cleaned up UI

Layout slightly better