[BUGFIX] minor bug fixes and layout updates