Added Menu Album; Changed structure