Add picture element, general cleanup