changes before branching
redo responsive main with proportional settings
some additional changes for the proportional set up
merged proportional