Some fixes and change on view