updated layout - changed it completely