fixed the full-name problem and added more layout