Refator views
Add wraping and countdown