Removed unused imports and made a few small style changes in views