Added fixes and removed unused styling