Clean up UI behaviour and layout for emails