Feature/contents

Merging and resolving conflicts. Starting to build the subnavigation of admission