Fixes and design update on client side