changed button locations on all pages
fixed conflicts