Visual preview implementation
Add border to preview
Freaking views refactoring