some re-layouting, content in flux