UI fixes. Made things fit properly and general ui cleanup