Added btn-loader option and fixed minor bugs