Updated style stuffs

This has some updates from Daniel and myself.