add Full Screen toogle
make Storage more generic