Fix styles and build