made the update function
made the update function
changed page to use templet layout
Merge origin/master