^ cleanup framework
^ update with new layouts structure