Final GUI Changes