Made problem 21 prettier
Solved problem 23, will improve later