some view changes + Android 4.0 support