Fixed layout. Added backup
more changes