decrease scope of application, fix bugs, make navigation consistent