bunch of visual changes from marcus feedback