Made many small changes to User Experience