renamed a few variables, adjusted the flex box stuff.