Code refactored and increased commands per page to 20