Add more GUI improvements