updated plans styling
updated styling and added side nav
removed conflicts