progress on edit page layout and minor bug fixes