fix queue npe
add edit form activity
remove dead layout files