UI tweaks; removed unused references; modified git files