PLA-1305 adding type model, type saving and ui changes