Move style in gsp to css files
fix merge conflicts