Altered what layout to use, and added order and is_active to DB results,