Client Backend and UI tweaks