GUI Modularity, slight camera improvement