Revert "Revert "Unit UI Positioning""

This reverts commit 33e7596b886dabf198d79ee6b6ae3d4d6004e6af.
Removed junk files

Needs double checked