Aanpassingen in layout
Fixed conflict