Fix login redirector
Update toolbar to include wrapper div