Fixing some issues, UI testing