improve upload and edit pages

fixes #56 and resolves #57