Removed unnecessary imports and improved display position