Refactor views & function structure, better success message