Version 2.0 in progress - New UI inspired by Material