ALM-606 small frontend tweaks