Minor Layout clean up