Fix alignment errors
Make OUI Manager Look-and-feel Consistent