static version v3

conflicts resolved, clean css