added more layout and functionality