updated some layouts and code