Mhotar/layout alignments issue#584

It seems It is ready to be merged. #584 

Bertrand: please check f676589 , there I am not sure It can be changed as I did It.