refactor builder and spinner

add return-to option for login pages, for use with 401's