More refractoring and adding jquery accordion