Starting to fix styles up
More styling