much better UI with all linked together