Handle attribute synchronization, move buttons to menu, remove cruft