Refactor and cleanup (dummy) module view