CSS layout bug fixes