added more layout functionality