Made undecorated frame not image-dependent