[#909] Top nav is now responsive

Fixed markup issues and performances

@kardan please review small changes