Layout fixes as per Dana