Tests added, some UI changes to prevent useless errors