Restructuring fixups, new user menu, design changes.