Fixed namespace naming
Added more GUI functionality