merging with master for css

Finally adding some CSS