Quick entry factor/user based

Crated the quick entry as iframe with user based information and factors
based information
Merged master fixed conflict