Adding base style and few corrections