Adding PQRatController and 2 icon options
Resolving conflicts