layout rethink
layout rethink/refactor