Shape selection finally working.  Cleaned up a little retina logic here and there.