enhance look and feel and correct several bugs