moon logic and layout tweaks