Fixed some movement parameters and a bug in movement.  Reorganizing some UI stuff