Bathroom floor plan, walls and doors are fixed - Feedback?

Hello,

We have received preliminary plans and are currently checking whether we have made good use of our bathroom on the upper floor and the WC/shower on the ground floor or if anyone has any ideas.
On the ground floor, we would like to install a urinal if possible.

Walls and doors are fixed. Windows can still be moved.

Dimensions of the ground floor are 2.20x2.40
Dimensions of the upper floor are 4.30x2.80

Thanks in advance for any suggestions for improvement.

Looks too cramped for me on the ground floor, but I don't like urinals in private homes anyway. Personally, I would also first swap the positions of the toilet and the washbasin.

In the large bathroom, I would swap the shower and the sink so that there is daylight from the side on the mirror. Also, a window would be placed between the two.

On the ground floor:
In terms of space distribution, you usually get the best results in small square shower bathrooms by placing the shower between the sink and the toilet. Then access the shower diagonally (google is your friend).

I would also swap the sink with the toilet on the ground floor.

Ground floor: swap and place both opposite each other.

Upper floor: bathtub instead of shower, shower instead of washbasin, washbasin instead of bathtub.