Removed Extra panels and fixed Issue #31