merging fixes
Merge pull request #16 from avneev/footerUI

merging fixes