Fixed most of tast 3, some minor javascript remains