Fixing styling related issues mostly