Notes/layout cleanup