Updated notes and layout