added more views and code generation, cleaned code a little