removed unused imports an layout bug fix