Added styles
Fixing issues
Fix issues