Remove generated files. Minor layout fixes.