More bug fixes with stylesheet