Made a second pass at basic stylings