Reverted some buttons (next) to previous state. Re-arranged Account Settings page