Footer Fix & Lots of bug fixes

Thanks to Hisham Beshayer for his hard work on these bug fixes