changes to main layout, comments
merge changes