cleaned up some templates, updated code, fixed gui