Implement user limit
Make slight UI changes