One issue with Devank's drawing is that the location of the stairs change, which will impact the upstairs layout too.
If you have a look at the duplex in Earlwood, assuming they were at the FSR limit, it would explain why the entry is pushed in.
If you did the same, you could remove the...