improved navigation and removed unneeded buttons