Album controller, views refactors