Minor GUI improvements. Cleaner code