More work on sub edit page