Renamed Confirmation to Account + minor tweaks