Small code cleanup
Work on better multi-layered screens, and small fixes