Added bottom panel, plus some bug fixes