UI properly resizes and repositions with window
Refactored control names.