It is beautiful the way you have laid it out.
I took Geometry in HS and could never "get" then hang of it - I was - like a lot of people - thinking what the heck, I'll never use this when I "grow up". Little did I know how much it would help me now. I'm learning more now about Geometry then I ever did in HS. I think practical application helps more than from a book - sometimes.