post developui merge, minor fixes for comments todo: fix styling