Made some layout changes and fixed the import error