ALM-607 fixed some small layout inconsistencies