remove missing imports
Fix layout and a bunch of exceptions