Handle screen resizing
Remove buggy save/restore