added ui panels and some improvements