refined layouts
clear bug fixed