refactored orders and login features