Made changes to move UI towards FX.