Reformatting and scrollng bug fix