Tweaks to make it a bit more app like