moved css to external resource
fixed merge