Added CSS stuff to M2 and some small changes to M1