Removed unused f() + added plenty for order page