[#88][#66][#76]Some UI Adjustments