some design improvements + local imge bug fixed