Refactor of Controller as a Fragment