Remake all 1 : 5

Task 1, 2 fixed bugs, 3 ready to viewing