Manging events, layout tweaks