rewrote layout for use with my fork of Gadgets

remove commented buffs/debuffs code

removed combo points for now