Various fix & design modification