Added better css handling