Lots of changes, fix a,b,c,d options and improve UI