mostly done minor css js rework