fix layout to fit within 1024 width
layout fix
fix margin