Added scroller, some fixed to opening