Increase scalability of speed remote UI
Clean up layout XML