Button Fix + Rate view + Other fixes