Fix styles and logic