fix issues (security,small bugs, UI issues)