Fixed issues with style