Fix some style issues and style popup