Improve navbar, collapse and affix widgets