Master - Comment Controller added & functional edit