added css elements
resolve merge conflicts