split fee
refactored main navbar
Merge remote-tracking branch 'upstream/master' into administrationchanges
some change
last changes
errors fixed