Some bugifxes, updates some nodes to fit into new desing