Finished with filling in layouts