Fixed typo
resolved css conflicts