Added numerous GUI changes