added folders, changed btn names