Map now uses remaining space