#6 Improved various GUI elements.