Lvuiui 61

@xcomanche
@mariyamoroz

Guys, please review and leave your comments
Refactor this for better read