toggle refactor + added scroll only when displayed