Update on CWM, delete recovery.mk, updated ui