Ui updates

Move this to a helper to remove the logic from the view?