Navbar icons & updated form macros