Tweak UI, fix next and prev buttons