Align comments, cleanup
Picture insertion and deletion
Preferences insertion and deletion