Fixes and refactoring to motor bracket
Incomplete work on the new sliding blocks