Update layout and removed ununsed images