fixed #718

I think I fixed some of these issues.  I just made it "usable" so this
is not a finished design.  It's just so you can actually press buttons
and what not.