Some UI Updates and closes #21