Added more options and fixed badges