Clean up UI a bit
Add vs view