Resolved some style related issues