Finished initial go at styling