Clean up + GUI almost done