some design improvements + local image bug fixed