Touched up layout a bit more