Refactoring and some CSS fixes
Markdown fix