Fixed bugs/refactor

Need to still fix height issues with history lists