Few smaller changes to the layout following Blanca's comments