Added more styling
merge conflict fix with tims stuff