improve layout with URI decode