small transition fix and extended settings mode