better layout
fix ordering of issues