Cleaned GUI, added neighbourhoods