Please, let me sat few words, about your floor plan.
1. Kitchen// is removed from central location and placed to corner, near small bathroom.
Why? I assumed zyou will not spend so much time in the kitchen, so it is not central place in your apartment. However, when you are in the kitchen, you are connected with dinning via glass door, which close the kitchen. Also, you will have natural light, but not so big. There will be no kitchen island, as there are no room for it. Sorry.
2. Working units// I placed them in central place. As you are working from the house, I think that you are always 24/7 in working mode, so placing the 2 working units in center of your apartment, will give you abillity to always do some little, and to be with each other all the time (ok, this is not adventage everytime!). Basically, your job will be in the place where you can always do "some litlle here and there".
3. Master bedroom// For me, this is perfect solution.You have everything you need, bath, walk-in closet and big bed.
4. Small bedroom, living area and terrace// It basically remains the same as it is already proposed.
I hope you will find it good solution for your needs.
Best Regards and have nice time in your apartment!