fixes
delete flash in layout
TODO fixes