Code cleanup
GUI refinement

Still need to fix camera overlay conflict