Moved UIUtility to common
Moved Units to Common