added todos and changed button type