Add case 2 & fix footer position