Remove album button; re-sort alphabetically when name of album is changed; merge album with same name
Minor fixes