Removed test buttons and trimmed html