Fixed some issues concerning the up button