Add some more styling along with less compilation