re-ordering css and fixing enqueue names