working on fixing the scrollbar etc.