Some views added + base drawing