Fix canvas dimension sync issues and clean up layer styles a little