Some changes in DB, App & Layout structure