Added A* and general UI improments