Corrected Form errors and more GUI enhancements