Jh

merging jh branch into master to get background layout