Designing a bit

Design looks so much better now! :) Also noticed a tiny bug in places, a
misplaced line of code. Fixed. Oops :)