Refactored Adapters, removed comment view and menu view