Fix menu. Closes #2
Remove unused imports from views