Fix css and merge moer code