Additional gui improvements and edit dialog added