Changes in models and templates

Cannot work static files :(