UI fix, pop back bug and increase/decrease buttons enlarged.