fix viewer expand by height; improve some visual parts