Fix albums and reorder navigation