added in brick background and changed some gui elements accordingly
fixed merge conflict