Added and styled album view
fixing merge conflicts