concept for 1.1
update
better navigation