added some layouts and made smaller changes