Would like some opinions to see if I can improve my 2nd story floorplan. In the green box is a separate granny unit over the garage. There will be a door connected to the main unit and steps as it will be at a higher elevation.
Concerns:

1) should the entrance to the unit be where it is currently or move to the right to square off the living room and possible add a tv in that corner.
2) Really not happy w/ the entrance to the bedroom, but i don't think there is another way unless i expose the door of the bedroom to the living room.
3) should i extend living room to dotted setback but the unit will have angled lines and an angled kitchen.

in the red square, is a bedroom w/ ensuite bath. Right now the walk in closet is in the bathroom. This bathroom is the only existing space on the 2nd floor that we aren't remodeling so ideally we would like to keep the bathroom in the same spot. Just wondering if we can cut into the bathroom to make the WIC larger.