Even more GUI improvements