Revert "Revert "mouse and fixed alignment""

This reverts commit 57c825be14a89fae53b8d42b4a29308619e5334e.