Size fixes1
UI improvements
Closes #605