Added a few UI features