Fixes for API8
Still working on swip layouts and settings on API8