Front-end + Fixes

Here you will find the fixes for previous pull request, however I don't remember how we work the last time but It seems like I can't avoid at this point the pull request wit all the commits that I made. I perform the merge --squash but I could get the reslut in just one commit hope no problem on this way.