Albums now named Categories + better integration