ALm-607 small frontend adjustments