minor fixes and move some CSS back to theme