Made changes to the UI..:D