Added scrollview, formatted buttons