Cleaned up Add/Edit Page.