optimized, improved layout, added arrow-controls