reverted invalid merge
simplified navigation
fixed whitespace