Solved some style issues