Added Function Navigation (In alpha)

+ minor fixes