OrderActivity bugs fixed!