Development to master

mostly updating styles and page formatting