Base styles
Bug fixes