working on layout 2 and 1