Better ui fix #68