added macros and navbar fanciness