changing layout, lower dependencies