changed view and solved bugs
remove swp