Added notes and buttons