Added more GUI components