Small UI and Backend bug fixes