Better UI/UX, error handling, tweaks, fix #6