Update layout according to mockup
continuation of updating client to look like mockup