Aside and header links integrated

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>