Some API fixes and CSS fixes