Really fixed scaling... promise. Also added new button