Added more GUI classes