added album navigators, minor optimizations