added new gui stuff and did some cleaning and structuring