some layout fixes
PHOT-52 - finished connection between layout and backend