small adjustments
scrollbar + popup fix