Adds album views and controller fixes