Fix visual formatting
Fix css scroll issues
merge