Fixed UI and network issues