sorted out
layout
fix
Merge branch 'new_code'