Changed node storage method, minor ui tweaks