Before merging Justin's code
Fixed styles