Fixed bug #WEB-4570; fixed a couple of style issues