added two views and fixed some issues