
        Fix rebase issues and run Prettier on layout viewer code

c4276aa