Started working on units positioning [REMINDER: Revert changes in rules.rb and units_controller.rb to previous version!!!]