Cleaned up graphical widgets and made naming consistent