Changed layouts. Added shop and unit button