Layout looking much better