Made bootstrap 3 compatible and cleaned up views