Fixed edit buttons. Some cleanup in directories.