Removed unwanted imports and fixed view