Updated views and started on dabase development