#15 Fix styles