GUI correction; Small refractoring