Added functional as new kinship
Merge branches 'master' and 'improving-ui' into improving-ui
Removed TODO from pages test.