Tidy up layout for new session