Revert "updates"

This reverts commit c8a19e9bf32465321eaefc04639654436fa33899.
Introduced templates and fixed current user issues