Small fixes and css display issues