changes from meeting on 24/09
conflict in main layout js resolved