Refine account button #2

Addresses previous, incomplete addition of button-type driven layouts. Adds some conveniences for easier integration. Includes minor cleanup. No new user-facing functionality.