more model cleanup
fixed orientation change