Few more changes for btn btn-*