lots of changes
layout finalized
changes