Fixing some bugs/css issues