picture added, layout arranged