Some refactorings, added feature enlisting page

Refactored builder to return new feature set container (easier for unit
tests), added feature enlisting page (still WIP), refactored some unit
tests.