ESRVC-4655

Fixes and layout adjustments