UI improvement & zoom fixes