Finished version v1.5
Fixed merged
Added UI fixes