layout guidelines and fixes 87