switching branches, saving minor styling changes