Some more logic ... stuff in the GUI