Refactor: Used a view to contain view objects and redesigned
layout
Fixe bugs and exclued *.swp files