Refactored Navigation #59

Here's my initial proposal, see if this could be improved further.
Hm... i see... parameters also present... buy what about addition css attributes?