Tweaked size of borders on header and footer
Updated todos