remove TODO comment
add more stuffs to setting page