adjust toolbar sizes
switch list items to be custom label button combos
fixing some layout issues for android
Merge branch 'todo' into dev
Merge branch 'dev'