more editing and layout improvements