Restructure and scroll implemented