More command page work