added todos

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
some button layout changes, and variable name changes

Signed-off-by: Alexander Skjolden <alex@plastboks.net>