Fixed page switch saving bug and CSS adjustments