Add zoom buttons, Fix bug with scroll