Reorganised classes + added header/footer data from db