merged branches. some of the automerges have changed the appearance of the app