Refactor layout layers

Refactored menu layers, fixed double events etc.