Closes #167
UI positioning bugs fixed.