fixed layout to make it work
made changes to settlement page
Merge branch 'master'