add scrollbar and some changes