Consolidation of client info + UI improvements

Created by: JosephKiranBabu

This is to remove duplication between the client api exposed in #1066 and the information required for UI changes made in #1014.

There is also some additional work building upon #1066.