cleaning up layout a bit