Updated to v0.6.1

Small menu changes + Bug fix.