Minor adjustements, bug fix, footer adjustments